Skip to content

[FW][FIX] academic: Correction in translation of year #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
wants to merge 1 commit into from
Closed

[FW][FIX] academic: Correction in translation of year #214

wants to merge 1 commit into from

Conversation

fw-bot-adhoc
Copy link
Contributor

Forward-Port-Of: #211

@roboadhoc
Copy link

Pull request status dashboard.

@fw-bot-adhoc
Copy link
Contributor Author

@lef-adhoc @matiasperalta1 cherrypicking of pull request #211 failed.

stdout:

Auto-merging academic/models/academic_group.py
CONFLICT (content): Merge conflict in academic/models/academic_group.py
Auto-merging academic/i18n/es.po
Auto-merging academic/__manifest__.py
CONFLICT (content): Merge conflict in academic/__manifest__.py

stderr:

19:55:40.234459 git.c:444               trace: built-in: git cherry-pick 6a9b54d6f8cc728fb5b4a09ca16c19ce7a8ee877
error: could not apply 6a9b54d... [FIX] academic: Correction in translation of year
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@lef-adhoc lef-adhoc force-pushed the 18.0-17.0-t-48737-lef-iy1K-fw branch from f1ea9d5 to b500216 Compare February 20, 2025 19:55
@lef-adhoc
Copy link
Contributor

@roboadhoc r+

@roboadhoc roboadhoc closed this in 12653bf Feb 21, 2025
@lef-adhoc lef-adhoc deleted the 18.0-17.0-t-48737-lef-iy1K-fw branch February 21, 2025 14:15
@roboadhoc roboadhoc added the 17.1 label Feb 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
17.1 conflict forwardport
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@fw-bot-adhoc @roboadhoc @lef-adhoc